test ci with new qt.

diff --git a/.travis.yml b/.travis.yml
index 15f3858e8eabcfeaf24df4b36c14efa87b3c1e60..03774665118c843b49ad0f1ea2b82308f3b2be64 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,33 +1,7 @@
-sudo: true
-dist: trusty
-language: cpp
-compiler:
-  - gcc
-  - clang
-addons:
-  apt:
-    packages:
-    - expat
-    - fop
-    - valgrind
-    - xsltproc
-    - libxml2-utils
-    - qt5-default
-    - qtbase5-dev
-    - libqt5webkit5-dev
-    - qttools5-dev-tools
-    - qttranslations5-l10n
-    - libusb-dev
-    - docbook-xml
-    - docbook-xsl
-before_script:
-# get locale needed for test_encoding.
-# these commands seem to work on xenial
-#  - sudo sed -i 's/^# *\(en_US ISO-8859-1\)/\1/' /etc/locale.gen
-#  - sudo dpkg-reconfigure --frontend=noninteractive locales
-# but on trusty it took something different, including eating an error from local-gen.
-  - sudo locale-gen en_US ISO-8859-1 || sudo locale-gen
-  - locale -a
+sudo: required
+services: docker
+env:
+  - CC=gcc CXX=g++
+  - CC=clang CXX=clang++
 script:
- - ./build_and_test
-# TODO: build mac
+  - ./docker_hook

diff --git a/docker_hook b/docker_hook
new file mode 100755 (executable)
index 0000000..4ccaa4a
--- /dev/null
+++ b/docker_hook
@@ -0,0 +1,8 @@
+#!/bin/bash -ex
+#
+# setup up and run a docker build.
+# this is used by travis.
+#
+cnt=$(docker create  -v `pwd`:/app -e CC=$CC -e CXX=$CXX tsteven4/gpsbabel_build_environment bash -c "./build_and_test")
+docker cp . $cnt:/app
+docker start -a $cnt